From f2ded6a68558c2d7db05ffe532bb217bd2a5a9b5 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Mon, 29 May 2017 14:55:37 +0200
Subject: [PATCH] gtk: Change gtk_propagate_event() to propagate both ways.

This change is made for consistency, it doesn't make sense to expose
one-way propagation, as it can only break expectations from GTK+. This
function might be made entirely private in the future, but it still
makes sense to do this in one go for our internal usecases.
---
 gtk/gtkmain.c    | 47 +++++++++++++++++++++++++++--------------------
 gtk/gtkprivate.h |  2 +-
 gtk/gtkwidget.c  |  4 +---
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index d9411d5fce..b28df87258 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1605,7 +1605,6 @@ gtk_main_do_event (GdkEvent *event)
 {
   GtkWidget *event_widget;
   GtkWidget *grab_widget = NULL;
-  GtkWidget *topmost_widget = NULL;
   GtkWindowGroup *window_group;
   GdkEvent *rewritten_event = NULL;
   GdkDevice *device;
@@ -1689,14 +1688,6 @@ gtk_main_do_event (GdkEvent *event)
         }
     }
 
-  /* Find out the topmost widget where captured event propagation
-   * should start, which is the widget holding the GTK+ grab
-   * if any, otherwise it's left NULL and events are emitted
-   * from the toplevel (or topmost parentless parent).
-   */
-  if (grab_widget)
-    topmost_widget = grab_widget;
-
   /* If the grab widget is an ancestor of the event widget
    * then we send the event to the original event widget.
    * This is the key to implementing modality.
@@ -1835,8 +1826,7 @@ gtk_main_do_event (GdkEvent *event)
     case GDK_PAD_RING:
     case GDK_PAD_STRIP:
     case GDK_PAD_GROUP_MODE:
-      if (!_gtk_propagate_captured_event (grab_widget, event, topmost_widget))
-        gtk_propagate_event (grab_widget, event);
+      gtk_propagate_event (grab_widget, event);
       break;
 
     case GDK_ENTER_NOTIFY:
@@ -2575,13 +2565,24 @@ propagate_event (GtkWidget *widget,
     propagate_event_up (widget, event, topmost);
 }
 
+void
+gtk_propagate_event_internal (GtkWidget *widget,
+                              GdkEvent  *event,
+                              GtkWidget *topmost)
+{
+  /* Propagate the event down and up */
+  if (!propagate_event (widget, event, TRUE, topmost))
+    propagate_event (widget, event, FALSE, topmost);
+}
+
 /**
  * gtk_propagate_event:
  * @widget: a #GtkWidget
  * @event: an event
  *
  * Sends an event to a widget, propagating the event to parent widgets
- * if the event remains unhandled.
+ * if the event remains unhandled. This function will emit the event
+ * through all the hierarchy of @widget through all propagation phases.
  *
  * Events received by GTK+ from GDK normally begin in gtk_main_do_event().
  * Depending on the type of event, existence of modal dialogs, grabs, etc.,
@@ -2603,18 +2604,24 @@ void
 gtk_propagate_event (GtkWidget *widget,
                      GdkEvent  *event)
 {
+  GtkWindowGroup *window_group;
+  GtkWidget *event_widget, *topmost = NULL;
+  GdkDevice *device;
+
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (event != NULL);
 
-  propagate_event (widget, event, FALSE, NULL);
-}
+  event_widget = gtk_get_event_widget (event);
+  window_group = gtk_main_get_window_group (event_widget);
+  device = gdk_event_get_device (event);
 
-gboolean
-_gtk_propagate_captured_event (GtkWidget *widget,
-                               GdkEvent  *event,
-                               GtkWidget *topmost)
-{
-  return propagate_event (widget, event, TRUE, topmost);
+  /* check whether there is a (device) grab in effect... */
+  if (device)
+    topmost = gtk_window_group_get_current_device_grab (window_group, device);
+  if (!topmost)
+    topmost = gtk_window_group_get_current_grab (window_group);
+
+  gtk_propagate_event_internal (widget, event, topmost);
 }
 
 GtkWidget *
diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index 21de4862e2..01b71d15ed 100644
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -87,7 +87,7 @@ gboolean _gtk_translate_keyboard_accel_state   (GdkKeymap       *keymap,
                                                 gint            *level,
                                                 GdkModifierType *consumed_modifiers);
 
-gboolean        _gtk_propagate_captured_event  (GtkWidget       *widget,
+void             gtk_propagate_event_internal  (GtkWidget       *widget,
                                                 GdkEvent        *event,
                                                 GtkWidget       *topmost);
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 4a83376dc9..3ea62c2d93 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3537,9 +3537,7 @@ _gtk_widget_emulate_press (GtkWidget      *widget,
     }
 
   /* Perform propagation state starting from the next child in the chain */
-  if (!_gtk_propagate_captured_event (event_widget, press, next_child))
-    gtk_propagate_event (event_widget, press);
-
+  gtk_propagate_event_internal (event_widget, press, next_child);
   gdk_event_free (press);
 }
 
-- 
2.30.2